Drop unused theme-bits

diff --git a/configure.ac b/configure.ac
index 57a3519345f63a48bc67fcb394bc060943540bd0..0e9849d7aa955b1af84085a393241a321a640bdf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1674,7 +1674,6 @@ gtk/Makefile
 gtk/makefile.msc
 gtk/gtkversion.h
 gtk/gtk-win32.rc
-gtk/theme-bits/Makefile
 gtk/tests/Makefile
 modules/Makefile
 modules/other/Makefile

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 508c4aad84eaa5d5a56c044b6568031c41708756..31dc7890e8b8d8830648e332dfed61ec945469d6 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -16,8 +16,8 @@ else
 GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f"
 endif
 
-SUBDIRS = theme-bits . tests
-DIST_SUBDIRS = theme-bits tests
+SUBDIRS = tests
+DIST_SUBDIRS = tests
 
 if HAVE_PAPI_CUPS
 GTK_PRINT_BACKENDS=file,papi,cups
@@ -1348,12 +1348,6 @@ gtkbuiltincache.h: @REBUILD@ stamp-icons
 EXTRA_DIST +=                   \
        $(STOCK_ICONS)          \
        $(GENERATED_ICONS)      \
-       line-arrow.xbm          \
-       line-wrap.xbm           \
-       tree_plus.xbm           \
-       tree_minus.xbm          \
-       tree_minus.xpm          \
-       tree_plus.xpm           \
        gtk.def                 \
        gtk-win32.rc            \
        gtk-win32.rc.in         \

diff --git a/gtk/theme-bits/Makefile.am b/gtk/theme-bits/Makefile.am
deleted file mode 100644 (file)
index 0c6d3b2..0000000
--- a/gtk/theme-bits/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-INCLUDES = \
-       -I$(top_srcdir)         \
-        -I$(top_builddir)      \
-       $(BASE_DEPENDENCIES_CFLAGS)
-
-noinst_PROGRAMS = decompose-bits
-
-decompose_bits_SOURCES = decompose-bits.c
-decompose_bits_LDADD = $(BASE_DEPENDENCIES_LIBS)
-
-EXTRA_DIST += check-13.png check-13-inconsistent.png radio-13.png radio-13-inconsistent.png
-
--include $(top_srcdir)/git.mk

diff --git a/gtk/theme-bits/README b/gtk/theme-bits/README
deleted file mode 100644 (file)
index bbb3758..0000000
--- a/gtk/theme-bits/README
+++ /dev/null
@@ -1,29 +0,0 @@
-This directory contains bits and pieces used in the default theme.
-Right now, it contains a tool for extracting individual part 
-bitmaps from a composed image, and source images for the default
-check and radio buttons.
-
-The decompose-bits tools takes an image where the first line contains
-the colors for each part, and the rest of the image is the actual
-image.
-
-The colors on the first line are:
-
- pixel 0: black
- pixel 1: dark
- pixel 2: mid
- pixel 3: light
- pixel 4: text
- pixel 5: text_aa
- pixel 6: base
-
-The generated XBM bits for the base part include the bits for text and
-text_aa as well; this is so that the result can be drawn either
-with or without the text/text_aa indicator. 
-
-Make sure that any PNG images added to this directory are added with
-'cvs add -kb'.
-
-Owen Taylor
-9 February 2002
-

diff --git a/gtk/theme-bits/check-13-inconsistent.png b/gtk/theme-bits/check-13-inconsistent.png
deleted file mode 100644 (file)
index 3b27dc5..0000000
Binary files a/gtk/theme-bits/check-13-inconsistent.png and /dev/null differ

diff --git a/gtk/theme-bits/check-13.png b/gtk/theme-bits/check-13.png
deleted file mode 100644 (file)
index 50622ef..0000000
Binary files a/gtk/theme-bits/check-13.png and /dev/null differ

diff --git a/gtk/theme-bits/decompose-bits.c b/gtk/theme-bits/decompose-bits.c
deleted file mode 100644 (file)
index 99d84a4..0000000
--- a/gtk/theme-bits/decompose-bits.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2002, Owen Taylor
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <glib/gprintf.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define BYTES_PER_OUTPUT_LINE 15
-
-static gint
-output_byte (guchar byte,
-            gint   online)
-{
-  if (online == BYTES_PER_OUTPUT_LINE)
-    {
-      g_printf (",\n  ");
-      online = 0;
-    }
-  else if (online)
-    {
-      g_printf (",");
-    }
-
-  g_printf ("0x%02x", byte);
-  return online + 1;
-}
-
-static void
-do_part (GdkPixbuf  *pixbuf,
-        gint        part1_index,
-        gint        part2_index,
-        gint        part3_index,
-        const char *base_name,
-        const char *part_name)
-{
-  const guchar *pixels = gdk_pixbuf_get_pixels (pixbuf);
-  const guchar *color1;
-  const guchar *color2;
-  const guchar *color3;
-  gint rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-  gint n_channels = gdk_pixbuf_get_n_channels (pixbuf);
-  gint width = gdk_pixbuf_get_width (pixbuf);
-  gint height = gdk_pixbuf_get_height (pixbuf);
-  gint online = 0;
-
-  color1 = pixels + part1_index * n_channels;
-  color2 = pixels + part2_index * n_channels;
-  color3 = pixels + part3_index * n_channels;
-  pixels += rowstride;
-  
-  g_printf ("static const guchar %s_%s_bits[] = {\n", base_name, part_name);
-  g_printf ("  ");
-
-  while (height--)
-    {
-      guchar bit = 1;
-      guchar byte = 0;
-      const guchar *p = pixels;
-      gint n = width;
-
-      while (n--)
-       {
-         if ((part1_index >= 0 && memcmp (p, color1, n_channels) == 0) ||
-             (part2_index >= 0 && memcmp (p, color2, n_channels) == 0) ||
-             (part3_index >= 0 && memcmp (p, color3, n_channels) == 0))
-           byte |= bit;
-
-         if (bit == 0x80)
-           {
-             online = output_byte (byte, online);
-             byte = 0;
-             bit = 1;
-           }
-         else
-           bit <<= 1;
-
-         p += n_channels;
-       }
-
-      if (width & 7)           /* a leftover partial byte */
-       online = output_byte (byte, online);
-
-      pixels += rowstride;
-    }
-  
-  g_printf ("};\n");
-}
-
-typedef enum {
-  PART_BLACK,
-  PART_DARK,
-  PART_MID,
-  PART_LIGHT,
-  PART_TEXT,
-  PART_TEXT_AA,
-  PART_BASE,
-  PART_LAST
-} Part;
-
-static const char *part_names[PART_LAST] = {
-  "black",
-  "dark",
-  "mid",
-  "light",
-  "text",
-  "aa",
-  "base",
-};
-
-int main (int argc, char **argv)
-{
-  gchar *progname = g_path_get_basename (argv[0]);
-  GdkPixbuf *pixbuf;
-  GError *error = NULL;
-  gint i;
-
-  if (argc != 3)
-    {
-      g_fprintf (stderr, "%s: Usage: %s FILE BASE\n", progname, progname);
-      exit (1);
-    }
-
-  g_type_init ();
-  
-  pixbuf = gdk_pixbuf_new_from_file (argv[1], &error);
-  if (!pixbuf)
-    {
-      g_fprintf (stderr, "%s: cannot open file '%s': %s\n", progname, argv[1], error->message);
-      exit (1);
-    }
-  
-  if (gdk_pixbuf_get_width (pixbuf) < PART_LAST)
-    {
-      g_fprintf (stderr, "%s: source image must be at least %d pixels wide\n", progname, PART_LAST);
-      exit (1);
-    }
-
-  if (gdk_pixbuf_get_height (pixbuf) < 1)
-    {
-      g_fprintf (stderr, "%s: source image must be at least 1 pixel height\n", progname);
-      exit (1);
-    }
-
-  g_printf ("/*\n * Extracted from %s, width=%d, height=%d\n */\n", argv[1],
-         gdk_pixbuf_get_width (pixbuf), gdk_pixbuf_get_height (pixbuf) - 1);
-
-  for (i = 0; i < PART_LAST; i++)
-    {
-      /* As a bit of a hack, we want the base image to extend over the text
-       * and text_aa parts so that we can draw the image either with or without
-       * the indicator
-       */
-      if (i == PART_BASE)
-       do_part (pixbuf, PART_BASE, PART_TEXT_AA, PART_TEXT, argv[2], part_names[i]);
-      else
-       do_part (pixbuf, i, -1, -1, argv[2], part_names[i]);
-    }
-  return 0;
-}

diff --git a/gtk/theme-bits/radio-13-inconsistent.png b/gtk/theme-bits/radio-13-inconsistent.png
deleted file mode 100644 (file)
index f8fa57e..0000000
Binary files a/gtk/theme-bits/radio-13-inconsistent.png and /dev/null differ

diff --git a/gtk/theme-bits/radio-13.png b/gtk/theme-bits/radio-13.png
deleted file mode 100644 (file)
index 6b6de16..0000000
Binary files a/gtk/theme-bits/radio-13.png and /dev/null differ